Autogenerated HTML docs for v1.6.0.1-157-g7df43
diff --git a/git-daemon.html b/git-daemon.html index ab28133..9716f0a 100644 --- a/git-daemon.html +++ b/git-daemon.html
@@ -322,8 +322,9 @@ <div class="sectionbody"> <div class="verseblock"> <div class="content"><em>git daemon</em> [--verbose] [--syslog] [--export-all] - [--timeout=n] [--init-timeout=n] [--strict-paths] - [--base-path=path] [--user-path | --user-path=path] + [--timeout=n] [--init-timeout=n] [--max-connections=n] + [--strict-paths] [--base-path=path] [--base-path-relaxed] + [--user-path | --user-path=path] [--interpolated-path=pathtemplate] [--reuseaddr] [--detach] [--pid-file=file] [--enable=service] [--disable=service] @@ -460,6 +461,15 @@ </p> </dd> <dt> +--max-connections +</dt> +<dd> +<p> + Maximum number of concurrent clients, defaults to 32. Set it to + zero for no limit. +</p> +</dd> +<dt> --syslog </dt> <dd> @@ -736,7 +746,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2008-07-06 05:16:42 UTC +Last updated 2008-08-31 06:31:47 UTC </div> </div> </body>
diff --git a/git-daemon.txt b/git-daemon.txt index 4ba4b75..b08a08c 100644 --- a/git-daemon.txt +++ b/git-daemon.txt
@@ -9,8 +9,9 @@ -------- [verse] 'git daemon' [--verbose] [--syslog] [--export-all] - [--timeout=n] [--init-timeout=n] [--strict-paths] - [--base-path=path] [--user-path | --user-path=path] + [--timeout=n] [--init-timeout=n] [--max-connections=n] + [--strict-paths] [--base-path=path] [--base-path-relaxed] + [--user-path | --user-path=path] [--interpolated-path=pathtemplate] [--reuseaddr] [--detach] [--pid-file=file] [--enable=service] [--disable=service] @@ -99,6 +100,10 @@ it takes for the server to process the sub-request and time spent waiting for next client's request. +--max-connections:: + Maximum number of concurrent clients, defaults to 32. Set it to + zero for no limit. + --syslog:: Log to syslog instead of stderr. Note that this option does not imply --verbose, thus by default only error conditions will be logged.
diff --git a/git-name-rev.html b/git-name-rev.html index 78342c5..25e1b09 100644 --- a/git-name-rev.html +++ b/git-name-rev.html
@@ -405,7 +405,7 @@ <div class="listingblock"> <div class="content"> <pre><tt>% git name-rev 33db5f4d9027a10e477ccf054b2c1ab94f74c85a -33db5f4d9027a10e477ccf054b2c1ab94f74c85a tags/v0.99^0~940</tt></pre> +33db5f4d9027a10e477ccf054b2c1ab94f74c85a tags/v0.99~940</tt></pre> </div></div> <div class="para"><p>Now you are wiser, because you know that it happened 940 revisions before v0.99.</p></div> <div class="para"><p>Another nice thing you can do is:</p></div> @@ -428,7 +428,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2008-08-03 07:58:01 UTC +Last updated 2008-08-31 06:31:47 UTC </div> </div> </body>
diff --git a/git-name-rev.txt b/git-name-rev.txt index abd2237..7ca8a7b 100644 --- a/git-name-rev.txt +++ b/git-name-rev.txt
@@ -59,7 +59,7 @@ ------------ % git name-rev 33db5f4d9027a10e477ccf054b2c1ab94f74c85a -33db5f4d9027a10e477ccf054b2c1ab94f74c85a tags/v0.99^0~940 +33db5f4d9027a10e477ccf054b2c1ab94f74c85a tags/v0.99~940 ------------ Now you are wiser, because you know that it happened 940 revisions before v0.99.
diff --git a/gitattributes.html b/gitattributes.html index 38436be..c2d4113 100644 --- a/gitattributes.html +++ b/gitattributes.html
@@ -428,9 +428,8 @@ </dt> <dd> <p> - Unsetting the <tt>crlf</tt> attribute on a path is meant to - mark the path as a "binary" file. The path never goes - through line endings conversion upon checkin/checkout. + Unsetting the <tt>crlf</tt> attribute on a path tells git not to + attempt any end-of-line conversion upon checkin or checkout. </p> </dd> <dt> @@ -848,6 +847,35 @@ in the file. E.g. the string <tt>$Format:%H$</tt> will be replaced by the commit hash.</p></div> </div> +<h2 id="_using_attribute_macros">USING ATTRIBUTE MACROS</h2> +<div class="sectionbody"> +<div class="para"><p>You do not want any end-of-line conversions applied to, nor textual diffs +produced for, any binary file you track. You would need to specify e.g.</p></div> +<div class="listingblock"> +<div class="content"> +<pre><tt>*.jpg -crlf -diff</tt></pre> +</div></div> +<div class="para"><p>but that may become cumbersome, when you have many attributes. Using +attribute macros, you can specify groups of attributes set or unset at +the same time. The system knows a built-in attribute macro, <tt>binary</tt>:</p></div> +<div class="listingblock"> +<div class="content"> +<pre><tt>*.jpg binary</tt></pre> +</div></div> +<div class="para"><p>which is equivalent to the above. Note that the attribute macros can only +be "Set" (see the above example that sets "binary" macro as if it were an +ordinary attribute --- setting it in turn unsets "crlf" and "diff").</p></div> +</div> +<h2 id="_defining_attribute_macros">DEFINING ATTRIBUTE MACROS</h2> +<div class="sectionbody"> +<div class="para"><p>Custom attribute macros can be defined only in the <tt>.gitattributes</tt> file +at the toplevel (i.e. not in any subdirectory). The built-in attribute +macro "binary" is equivalent to:</p></div> +<div class="listingblock"> +<div class="content"> +<pre><tt>[attr]binary -diff -crlf</tt></pre> +</div></div> +</div> <h2 id="_example">EXAMPLE</h2> <div class="sectionbody"> <div class="para"><p>If you have these three <tt>gitattributes</tt> file:</p></div> @@ -910,7 +938,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2008-08-21 10:34:01 UTC +Last updated 2008-08-31 06:31:48 UTC </div> </div> </body>
diff --git a/gitattributes.txt b/gitattributes.txt index 5495d69..1f23d27 100644 --- a/gitattributes.txt +++ b/gitattributes.txt
@@ -105,9 +105,8 @@ Unset:: - Unsetting the `crlf` attribute on a path is meant to - mark the path as a "binary" file. The path never goes - through line endings conversion upon checkin/checkout. + Unsetting the `crlf` attribute on a path tells git not to + attempt any end-of-line conversion upon checkin or checkout. Unspecified:: @@ -486,6 +485,41 @@ commit hash. +USING ATTRIBUTE MACROS +---------------------- + +You do not want any end-of-line conversions applied to, nor textual diffs +produced for, any binary file you track. You would need to specify e.g. + +------------ +*.jpg -crlf -diff +------------ + +but that may become cumbersome, when you have many attributes. Using +attribute macros, you can specify groups of attributes set or unset at +the same time. The system knows a built-in attribute macro, `binary`: + +------------ +*.jpg binary +------------ + +which is equivalent to the above. Note that the attribute macros can only +be "Set" (see the above example that sets "binary" macro as if it were an +ordinary attribute --- setting it in turn unsets "crlf" and "diff"). + + +DEFINING ATTRIBUTE MACROS +------------------------- + +Custom attribute macros can be defined only in the `.gitattributes` file +at the toplevel (i.e. not in any subdirectory). The built-in attribute +macro "binary" is equivalent to: + +------------ +[attr]binary -diff -crlf +------------ + + EXAMPLE -------
